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

Merge "Toggle enable audio when an option selected" into rvc-dev am: 131401e2 am: 70cfafe2 am: db119790

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

Change-Id: I2d8359484535ff346db59fc66ac823cc4c33e5e9