Merge "OEM-configurable max screen magnification scale" into main am: 9bd0c46774 am: 1268acbf5f

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

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