[automerger skipped] Merge "AudioService: fix stream aliasing update" into...

[automerger skipped] Merge "AudioService: fix stream aliasing update" into tm-qpr-dev am: 0f245613 am: ce3f37e2 -s ours

am skip reason: Merged-In I74bc7fdf054ef295876c8a5503111c14d084e8d2 with SHA-1 e620bc2a is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21159618



Change-Id: Ibb4d72681f81f215271f22f651839afe417c864b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>