Merge "Refine the naming about compatible scale" into tm-qpr-dev am: bdaa6f70aa

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

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