Merge "Changed app string changes in user aspect ratio settings" into udc-qpr-dev am: 951bbde3

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



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