am 97b234f5: am b0517aca: am b19860ce: Merge "fix audio policy service binder security tests." into kitkat-cts-dev automerge: 6716898 automerge: f1fac19  -s ours

* commit '97b234f5235c52695ead8d8f85f220f9184c489f':
  fix audio policy service binder security tests.