Merge "Guard exposed carrier configs with aconfig flag" into main