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

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



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