Merge "Remove moreOptions in aspect ratio settings" into udc-qpr-dev am: 263126b580 am: 285a139c6f

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

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