[automerger skipped] Merge "Add startActivityAsUser to SystemApi" am: 3f4873baef am: 54ec5162de
am: 42079df1cc -s ours
am skip reason: change_id I693b3bf56f3be71f0790776e3aad5694717786ef with SHA1 4e615e6986 is in history

Change-Id: Ie93b09367d55fdf666dfb9eb2c688315cb761cf9