Merge changes from topic "bp-real-calling-(p|u)id-merge-first" into oc-dev
* changes: [automerger] [RESTRICT AUTOMERGE] Pass correct realCallingUid to startActivity() from startActivityInPackage am:216f65bf60am:0984de50e3am:36fdca0a65skipped:37ce2010d9[automerger] [RESTRICT AUTOMERGE] Pass correct realCallingUid to startActivity() from startActivityInPackage am:216f65bf60am:0984de50e3am:36fdca0a65[automerger] [RESTRICT AUTOMERGE] Pass correct realCallingUid to startActivity() from startActivityInPackage am:216f65bf60am:0984de50e3[automerger] [RESTRICT AUTOMERGE] Pass correct realCallingUid to startActivity() from startActivityInPackage am:216f65bf60[RESTRICT AUTOMERGE] Pass correct realCallingUid to startActivity() from startActivityInPackage
This commit is contained in: