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

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

Change-Id: Ied3c023ea3bfce1a608e674ceca9feda8d66b23c