Merge "Merge "Passing callingUid to internal methods" into oc-dev am: dacdf2e9 am: de066fd2" into oc-dr1-dev-plus-aosp