Merge "Allow UiAutomation to adopt the shell permission indentity"
am: 9f0115bb6e

Change-Id: I2f3d34f78446de60d51b84fcc81110585c9f2c81