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

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

Change-Id: I796dad110c13c865dfa63f523c92372bc0c53097