Merge "Update controls panel layout according to the design" into tm-qpr-dev am: 85582759df am: e74fa656f6 am: a7d9454143

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

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