Merge "Define streamlined_connectivity_battery_stats flag" into main