[automerger skipped] Merge changes from topic "cherrypick-grouped-volume-tweak-xnvceg1hww" into sc-dev am: e65fa2ba18 am: 3a9f146f3b am: 59c6401d0b -s ours am: 1fd7240719 -s ours

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

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

Change-Id: Ic8d605c1694773658afbba7f885fa402e7cf90d4