Merge "Don't allow the shell to change admin-locked app permissions."