Merge "Update udc-extended-api that ignores FlaggedAPI annotation" into main