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

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

Change-Id: I064e02172a86cd68afb757004102c68ce331dda6
tree: 28084afb8eb6677d52adcf2f08c0f86d62593902
  1. core/
  2. framework/
  3. service/
  4. services/
  5. tests/
  6. OWNERS