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