Merge "Fix crash in RequiresPermissionChecker.java"