Merge "Revert "Refactor permission checking to allow computing app op mode.""