[automerger skipped] Merge changes from topic...

[automerger skipped] Merge changes from topic "cherrypick-grouped-volume-tweak-xnvceg1hww" into sc-dev am: e65fa2ba am: 3a9f146f -s ours am: fff4f3ef -s ours am: 1e7e32e6 -s ours

am skip reason: Merged-In I71d7f11b9d88dfb9ef74814e9ac7f9d28b0e652c with SHA-1 0657b28b is already in history

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

Change-Id: Id79285ec042f0570eb1067fbc8b77945536bacc0