Merge "Ring volume icon stuck at normal" into tm-qpr-dev am: 1db65383

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



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