[automerger skipped] Merge "Fix Pixel HAL for Audio VTS V6.0" am: d00fb92a am: 7a6a02c8
am: 6f561e7e -s ours
am skip reason: change_id Iead2ed737a1994fd36f7b0f69ad107afcf14ddd6 with SHA1 3baf1e23 is in history
Change-Id: Iaecb7085e4edb23877d7756bda20a8cbf402fb74