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

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

Change-Id: I6719b51b78ace57bc36f4dba738c0c420947a8bf
tree: f8bfd256acd052c8554595ebd1409ab5526a8779
  1. core/
  2. framework/
  3. service/
  4. services/
  5. tests/
  6. OWNERS