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

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



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