Merge changes from topic "bp-real-calling-(p|u)id-merge-first" into cw-f-dev

* changes:
  [automerger] [RESTRICT AUTOMERGE] Pass correct realCallingUid to startActivity() from startActivityInPackage am: 216f65bf60 am: 0984de50e3
  [automerger] [RESTRICT AUTOMERGE] Pass correct realCallingUid to startActivity() from startActivityInPackage am: 216f65bf60
  [RESTRICT AUTOMERGE] Pass correct realCallingUid to startActivity() from startActivityInPackage