Merge "Bring width of controls panel up to spec" into tm-qpr-dev am: 34847016 am: fca5fea0

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



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