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

Change-Id: If21a26f16b8c88f1dab56ac7fa7a804a1e9077b0