Merge "Update controls panel layout according to the design" into tm-qpr-dev...

Merge "Update controls panel layout according to the design" into tm-qpr-dev am: 85582759 am: e74fa656 am: a7d94541 am: f681855b

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



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