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

Merge "Remove some unused dimensions" into tm-qpr-dev am: 7da32f64 am: 0adfb5a3 am: 9e1e28b8 am: 2846d0c3

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



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