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

Change-Id: I5f172634454b96a191d73a4d1fba5762d102969c