Merge "Merge "Merge "Controls UI - Remove reset" into rvc-dev am: 5031649f...

Merge "Merge "Merge "Controls UI - Remove reset" into rvc-dev am: 5031649f am: 6ec7785c" into rvc-d1-dev-plus-aosp am: 8856572d" into rvc-qpr-dev-plus-aosp am: 78bc273b

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

Change-Id: I7f67fee1c713719688ac1a18cbcca41cab3217c7