Merge "Give shell CONTROL_KEYGUARD permission."