Merge "Fix crash in RequiresPermissionChecker.java" into tm-qpr-dev