Merge "Fix UnsupportedOperationException in Display Settings" into sc-dev am: cb1574319b
am: e780d3f652
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14639272 Change-Id: If79ed0fd13fea421c663b9a5302debea4e910ff7
This commit is contained in: