Merge "Ensure all calls to getCallingUid use the version in mDeps." am: d610e43383 am: 3559535c50 am: ee70e4d92b

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

Change-Id: I064e02172a86cd68afb757004102c68ce331dda6