[automerger skipped] Merge "Add ScreenResolutionController to Settings app" into tm-dev am: 27ad4dcf23
am: b38fac221d
-s ours
am skip reason: Merged-In I46d3be3b82ca512b8672efaa489df2cdaab26d6d with SHA-1 0dea418d57
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17046255
Change-Id: I50fe88270a2417b7a8b56e3498f6163a452826b3
This commit is contained in: