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

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



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