Merge "Revert "Revert "Change volume ringer icon based on device config"""...

Merge "Revert "Revert "Change volume ringer icon based on device config""" into tm-qpr-dev am: 86e827d3 am: 841a6783

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



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