Merge "Use experimental string in user aspect ratio settings" into udc-qpr-dev am: 10050559

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



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