Merge "Fixes to remove controls for tablet" into tm-qpr-dev am: 68fcdeeb am: 8b016f2e

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



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