[automerger skipped] Merge "[BUG] AudioPolicy: fix AudioDeviceCallback" into...

[automerger skipped] Merge "[BUG] AudioPolicy: fix AudioDeviceCallback" into tm-qpr-dev am: 25c68079 am: 8932a7dd -s ours

am skip reason: Merged-In I0b4f852280046cc596da9194cab4655316a026a4 with SHA-1 7e39df23 is already in history

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



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