Merge changes from topic "grouped-volume-tweak" into sc-v2-dev am: f2564685

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

Change-Id: Ifb352d0b8e2cb8d8f309b96b5340d8de689e799c