Merge "Enable User Aspect Ratio Settings by default" into udc-qpr-dev am: f7a443b4 am: c8bd304d

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24620828



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