am 7a138f7a: am db02a5b6: am 18051d38: am 23ba9755: Merge "Revert "fix audio policy service binder security tests."" into kitkat-cts-dev automerge: f394d10 automerge: 6ec683d

* commit '7a138f7a052e37eec2c0756fbf15f09db52f73f6':
  Revert "fix audio policy service binder security tests."