Merge "EnforcePermissionHelperDetector: allow ancestors to call super instead of helper"