Merge changes from topic "cherrypick-volume-gar-chain-" into udc-qpr-dev am: c156b6c4

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23830401



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