am 7a6b05b0: am 6ec683d9: Merge "Revert "fix audio policy service binder security tests."" into kitkat-cts-dev automerge: f394d10

* commit '7a6b05b09832c284828ea7aed8c9228093a39214':