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

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

Change-Id: I6719b51b78ace57bc36f4dba738c0c420947a8bf