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

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



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