Merge "Change back to Device controls" into sc-dev am: 04781ed449

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

Change-Id: Ic48a4c89138011a82ac892c7373f978c2130c52a