Merge "Change volume ringer icon based on device config" into tm-qpr-dev am:...

Merge "Change volume ringer icon based on device config" into tm-qpr-dev am: 296c636f am: 2319044e

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



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