[automerger skipped] [automerger] [RESTRICT AUTOMERGE] Pass correct realCallingUid to startActivity() from startActivityInPackage am: 216f65bf60 am: 0984de50e3 am: 36fdca0a65 skipped: 37ce2010d9 am: 51bb716332
am: ff8be5d87a -s ours
am skip reason: change_id I0ef42c2f89b537a720f1ad5aefac756b0ccac52e with SHA1 f5e5af7f3d is in history

Change-Id: I730d970d5b50cf8b4b0770da8ec22534a9e14a58