Merge changes from topic "am-7fb5fba22bd34217a1fd9962cdd27618"
* changes:
[automerger skipped] Merge changes from topic "upstream-hal-v6" am: 82d6654ade am: 8b7e1af6ee am: 430c4038af -s ours am skip reason: change_id I3347ee3aabe753d34c69dacbd707c60105d80a47 with SHA1 c5b098a76b is in history
[automerger skipped] Support Audio HAL V6 am: f22253bc9f am: ae6fa514a8 am: 9f0d07f548 -s ours am skip reason: change_id Ied5aeccdf8f1e9a085ed9cac9d696271b7a1bb63 with SHA1 a4026674ce is in history
[automerger skipped] libaudioHAL: reduce version specific code am: 00538f18b8 am: ddfa210b93 am: 577cae5d3f -s ours am skip reason: change_id Ia8c99c0600425321b4b30ac341168101960eed59 with SHA1 f419435ea9 is in history
[automerger skipped] Avoid querying the audio service twice am: a8f139322e am: 182ee54371 am: 257cf23fc9 -s ours am skip reason: change_id Ia884d0e926569d983ba12952817d2cecc8d8d34f with SHA1 b9448c72d5 is in history