Merge "Remove aconfig flags for Connectivity FlaggedAPI annotations" into main