[automerger skipped] Merge "Allow UiAutomation to adopt the shell permission indentity" am: 9f0115bb6e am: 178684530b
am: 0acab502a0 -s ours
am skip reason: change_id I4bfd4b475225125512abf80ea98cd8fcacb6a1be with SHA1 d873ae62c4 is in history

Change-Id: I6ab92aea70c139985953a1f9c78111e4c5bf907b