Merge "Add aspect ratio settings to advanced category children" into...

Merge "Add aspect ratio settings to advanced category children" into udc-qpr-dev am: 6e9666ab am: 8319a775

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



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