Merge "Remove version text in user aspect ratio settings page" into udc-qpr-dev am: f2735dec

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



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