Merge "Use Context in Notification PermissionHelper" into udc-dev