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

Merge "Merge "[VolumePanel] Fix the Hearable control slice uri parameter" into tm-dev am: fc45c252 am: f7b4e4ad" into tm-d1-dev-plus-aosp am: 4b1b519a

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



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