Merge "Fix DefaultSmsApplicationTest for organization-owned profile owner" into udc-dev