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

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

Change-Id: I2f8ed60397529df91c25119e693d667aea7ed876