Merge changes from topic 'am-926851ce939c423f904f8abf8c13e7e5' into nougat-mr1-cts-dev

* changes:
  Merge changes from topic 'am-736a6572a9704bdf94c4c8f32eb82316' into nougat-cts-dev am: 43375564df
  DO NOT MERGE: CTS Test for security vulnerability fix: potential OOB write in audioserver am: e2f015fb2b  -s ours am: 034dd7f80b  -s ours