[automerger skipped] Merge "Fix ACTION_VOLUME_CHANGED behavior" into...

[automerger skipped] Merge "Fix ACTION_VOLUME_CHANGED behavior" into tm-qpr-dev am: a6abfc6e am: 20f3fc13 -s ours

am skip reason: Merged-In I31ca413666e9db94b1ed2db20c87effb46753e3e with SHA-1 d291a1e8 is already in history

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



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