Merge "Handle multiple users when adding and rechecking overrides." into sc-dev am: b295cc90 am: 5cbaa013

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15080634

Change-Id: Iebe1853aa761cc459cc6ee5e39fb478294f5049e