[automerger skipped] Merge "Refine the naming about compatible scale" into...

[automerger skipped] Merge "Refine the naming about compatible scale" into tm-qpr-dev am: bdaa6f70 am: d190a310 -s ours

am skip reason: Merged-In Ifbd2ca725bed231d9e6dd8190df3dc773d4402b7 with SHA-1 bcbd60c4 is already in history

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



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