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 am: 42ee836e

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



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