Merge "Merge "Separating the UI logic for SettingsPanel and ModeSwitchButton"...

Merge "Merge "Separating the UI logic for SettingsPanel and ModeSwitchButton" into udc-dev am: 1c02715e am: 68b90940 am: 44e2edd6" into udc-qpr-dev-plus-aosp am: 8afc21aa

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



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