Merge "Fix ACTION_VOLUME_CHANGED behavior" into tm-qpr-dev am: a6abfc6e1a

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

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