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