Merge "Remove some unused dimensions" into tm-qpr-dev am: 7da32f64

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



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