Merge "Reduce unnecessary measure" into tm-qpr-dev am: 80c145dc am: 064bb0a7

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



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