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

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

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



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