[automerger skipped] Merge "Add ScreenResolutionController to Settings app"...

[automerger skipped] Merge "Add ScreenResolutionController to Settings app" into tm-dev am: 27ad4dcf -s ours

am skip reason: Merged-In I46d3be3b82ca512b8672efaa489df2cdaab26d6d with SHA-1 b7b6ed91 is already in history

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

Change-Id: Ib28fcf2d27e95d82dbf607a71351603b571a7fed