am 2b7a3a48: am 4057a3f6: am 72ffb41f: am 3297b259: am e4ff0843: am f394d10b: Merge "Revert "fix audio policy service binder security tests."" into kitkat-cts-dev

* commit '2b7a3a4818c9f896b281b4ed072f92b58a6fcea1':