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

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



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