Merge "Update MULTIUSER_OWNERS." am: b0c148971a am: c60977da3d

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

Change-Id: I8f00c862467c21811176adbf5c54f5acc3b7c114