Merge "[VolumePanel] Fix the Hearable control slice uri parameter" into tm-dev...

Merge "[VolumePanel] Fix the Hearable control slice uri parameter" into tm-dev am: fc45c252 am: 3b2fe3e8 am: 863843c7

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



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