Merge "Ensure calling user is the same as requested user." into sc-dev am:...

Merge "Ensure calling user is the same as requested user." into sc-dev am: 34a952cf am: 4837c4f6 am: 074f760b

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

Change-Id: Ib95c5bffb028c5222cdbcf47f3d7d289f5a00cb6