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

Change-Id: If5f30b1a0abb5ac52bda85d9535272f863423a29