Merge "Use experimental string in user aspect ratio settings" into...

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

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



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