Merge "Remove flag com.android.systemui.status_bar_chips_return_animations from trunk_staging." into main