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

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

Change-Id: I15463c214ccefad437ca172664c6a4cfb3eeebd5