Merge changes I6bcc87c6,If633e677

* changes:
  Revert "audio policy: refactor audio record APIs"
  Revert "audio flinger: move record permission checks to audio policy service"