[automerger skipped] [RESTRICT AUTOMERGE] Pass correct realCallingUid to startActivity() from startActivityInPackage skipped: bab818fd4c skipped: d33940512a skipped: 4278315b95

Change-Id: If688033850b010958ba8795c2a85f4f060fccbb8