Merge "Update Device Controls API layout" into udc-qpr-dev am: 80f819e2

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



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