Merge "Apply user aspect ratio override settings" into udc-qpr-dev am: 9b489184 am: 9f2a5d62

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



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