Merge "Enable User Aspect Ratio Settings by default" into udc-qpr-dev am: 120a00dc am: 048037f5

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



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