Merge "Global scale must always be updated when size compat scale is changed"...

Merge "Global scale must always be updated when size compat scale is changed" into main am: 7b5463ab

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



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