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

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



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