[automerger skipped] Merge "Remove version text in user aspect ratio settings...

[automerger skipped] Merge "Remove version text in user aspect ratio settings page" into udc-qpr-dev am: f2735dec am: de41256d -s ours

am skip reason: Merged-In Iaf757715e60ab4ff2356ee0c89bc2129948a6c08 with SHA-1 eb7eee65 is already in history

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



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