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