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

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



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