Merge "Allow ROOT_UID to execute privileged shell cmds" am: 1c5689ba4a am: a0bd643033
am: c22beba9de

Change-Id: I2ae8bdf7399c3c29eb2a6e88caa0d6d1fc06295b