Merge "[ScreenResolutionController] UI string update" into tm-d1-dev am: 19b9978591
am: d99149b0b4
am: 0797510276
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17983872 Change-Id: I1cab9e6ed23b63a5e0de68c45d6c1b30adad4edb Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: