am 1231bdbe: am 6f235327: am d4ee847f: am d1c9037a: Merge "DO NOT MERGE - audio policy: validate stream type received from binder calls." into lmp-dev

* commit '1231bdbe2465ecba886c446d2f682716b59d3186':
  DO NOT MERGE - audio policy: validate stream type received from binder calls.