Merge "Merge "Toggle enable audio when an option selected" into rvc-dev am:...

Merge "Merge "Toggle enable audio when an option selected" into rvc-dev am: 131401e2 am: 4a108615" into rvc-d1-dev-plus-aosp am: e7124af2

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

Change-Id: I633e16fbef3f676c75d1fa492e12ea5a82c8498c