Merge "Update CellBroadcastConfigTraker state for cleanupCdma case" into main