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: f7b4e4ad

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



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