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

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

Change-Id: I5acc5e01b46d943bb8ec72531fb79814a019a1b7