Merge "Handle multiple users when adding and rechecking overrides." into sc-dev am: b295cc900b am: 5cbaa01396 am: 4d8c8f4a0d
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15080634 Change-Id: I9c6217228a0bbf1ebe41c8c44a8257a89c2491d2
This commit is contained in: